ffmpeg.git
17 months agofftools/ffmpeg_filter: treat apad filter as a source
Anton Khirnov [Sat, 12 Oct 2024 17:08:55 +0000 (19:08 +0200)]
fftools/ffmpeg_filter: treat apad filter as a source

Ideally lavfi should have a dedicated API for detecting this.

Fixes #11168 and #11061

(cherry picked from commit 9e2a231236428c4682c77858c6aabfd74f459b17)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Gbp-Pq: Name 0014-fftools-ffmpeg_filter-treat-apad-filter-as-a-source.patch

17 months agolavc/avcodec: fix global/private option precendence
Anton Khirnov [Sun, 13 Oct 2024 12:11:39 +0000 (14:11 +0200)]
lavc/avcodec: fix global/private option precendence

Broken after 7753a9d62725d5bd8313e2d249acbe1c8af79ab1. Apply only the
whitelist early, and the rest with a single call to av_opt_set_dict2()
with AV_OPT_SEARCH_CHILDREN, which should be equivalent to the original
behaviour.

Reported-by: Cameron Gutman <aicommander@gmail.com>
(cherry picked from commit 9ce63e65d65b303813d4ae677228226d7cd232b9)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Gbp-Pq: Name 0013-lavc-avcodec-fix-global-private-option-precendence.patch

17 months agoavfilter/framesync: fix forward EOF pts
Nicolas Gaullier [Fri, 4 Oct 2024 09:02:49 +0000 (11:02 +0200)]
avfilter/framesync: fix forward EOF pts

Note1: when the EOF pts is not accurate enough, the last frame
can be dropped by vf_fps with default rounding.

Note2: vf_scale use framesync since e82a3997cdd6c0894869b33ba42430ac3,
so this is a very commonplace scenario.

For example:
./ffprobe -f lavfi testsrc=d=1,scale,fps -of flat \
  -count_frames -show_entries stream=nb_read_frames

Before:
streams.stream.0.nb_read_frames="24"

After:
streams.stream.0.nb_read_frames="25"

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit de976eaf30df33e86c58c8c9af9905c1d8441934)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Gbp-Pq: Name 0012-avfilter-framesync-fix-forward-EOF-pts.patch

17 months agoavcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1
Ingo Brückl [Wed, 9 Oct 2024 02:43:01 +0000 (04:43 +0200)]
avcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1

This adds VAAPIEncodeContext *ctx that has been removed
in aa82340b0ccdde4955fba41b8de5e45348ecd11d.

Signed-off-by: Ingo Brückl <ib@oddnet.de>
(cherry picked from commit 5557c673ea783a48e8b97c2b740b22eeeca6399b)

Gbp-Pq: Name 0011-avcodec-vaapi_encode-fix-compilation-without-CONFIG_.patch

17 months agolibavcodec: x86: Remove an explicit include of config.asm
Martin Storsjö [Tue, 1 Oct 2024 20:59:41 +0000 (23:59 +0300)]
libavcodec: x86: Remove an explicit include of config.asm

This file is never included explicitly anywhere else, it's only
included implicitly by passing -Pconfig.asm on the command line.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 5c4ede6b4ff6fa8818f0ca3f686aa54c1c2092b8)

Gbp-Pq: Name 0010-libavcodec-x86-Remove-an-explicit-include-of-config..patch

17 months agocheckasm: lls: Use relative tolerances rather than absolute ones
Martin Storsjö [Fri, 4 Oct 2024 07:22:57 +0000 (10:22 +0300)]
checkasm: lls: Use relative tolerances rather than absolute ones

Depending on the magnitude of the output values, the potential
errors can be larger.

This fixes errors in the lls tests on x86_32 for some seeds,
observed with GCC 11 (on Ubuntu 22.04, with the distro compiler,
with -m32).

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6668268e16b6d1a6992840dccb12effece2e7202)

Gbp-Pq: Name 0009-checkasm-lls-Use-relative-tolerances-rather-than-abs.patch

17 months agoarm: Consistently use proper interworking function returns
Martin Storsjö [Thu, 3 Oct 2024 21:30:24 +0000 (00:30 +0300)]
arm: Consistently use proper interworking function returns

Use "bx lr", or "pop {lr}", which do proper mode switching
between thumb and arm modes. A plain "mov pc, lr" does not switch
from thumb mode to arm mode (while in arm mode, it does switch
mode for a thumb caller).

This is normally not an issue, as CONFIG_THUMB only is enabled if
the C compiler defaults to thumb; but stick to patterns that can
do mode switching if needed, for consistency.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 77e6293735262b20a86b5047b77991a86cf4e9e1)

Gbp-Pq: Name 0008-arm-Consistently-use-proper-interworking-function-re.patch

17 months agoavcodec/libx265: unbreak build for X265_BUILD >= 213
Gyan Doshi [Sat, 5 Oct 2024 04:38:31 +0000 (10:08 +0530)]
avcodec/libx265: unbreak build for X265_BUILD >= 213

Earlier, x265 made an API change to support alpha and
other multiple layer pictures. We added guards to accommodate
that in 1f801dfdb5

They have now reverted that API change in
https://bitbucket.org/multicoreware/x265_git/commits/78e5b703b1

Updated our wrapper guards to unbreak build again.

Gbp-Pq: Name 0007-avcodec-libx265-unbreak-build-for-X265_BUILD-213.patch

17 months agofftools: log unconnected filter output label
Marvin Scholz [Tue, 1 Oct 2024 01:20:04 +0000 (03:20 +0200)]
fftools: log unconnected filter output label

(cherry picked from commit f25c9cc213c7e3eb585d3339eb775b16921c4d98)

Gbp-Pq: Name 0006-fftools-log-unconnected-filter-output-label.patch

17 months agofftools: do not access out of bounds filtergraph
Marvin Scholz [Tue, 1 Oct 2024 00:57:11 +0000 (02:57 +0200)]
fftools: do not access out of bounds filtergraph

The log message was logged for `filtergraphs[j]` which would cause a
heap buffer overflow in certain circumstances.

Correctly it should be logged for the current filtergraph, so just
use `fg` here.

(cherry picked from commit 5beeb3a1f97d8f6d4076fe83aaf5e2e5871f945e)

Gbp-Pq: Name 0005-fftools-do-not-access-out-of-bounds-filtergraph.patch

17 months agoavcodec/mediacodecenc: Fix access of uninitialized value
Zhao Zhili [Thu, 3 Oct 2024 17:30:57 +0000 (01:30 +0800)]
avcodec/mediacodecenc: Fix access of uninitialized value

When crop is skipped, av_strlcatf will access `str` which isn't
initialized properly.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
(cherry picked from commit eff9ed7bff45998ea370e3d6f627529ad47e2e74)

Gbp-Pq: Name 0004-avcodec-mediacodecenc-Fix-access-of-uninitialized-va.patch

17 months agoavformat/img2enc: Fix integer truncation when frame_pts is enabled
Zhao Zhili [Mon, 23 Sep 2024 16:16:13 +0000 (00:16 +0800)]
avformat/img2enc: Fix integer truncation when frame_pts is enabled

Fix #11194

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
(cherry picked from commit f56a54387b9cea884ca139e9cb993ff6989b8def)

Gbp-Pq: Name 0003-avformat-img2enc-Fix-integer-truncation-when-frame_p.patch

17 months agoavformat/internal: Add ff_get_frame_filename
Zhao Zhili [Mon, 23 Sep 2024 15:14:19 +0000 (23:14 +0800)]
avformat/internal: Add ff_get_frame_filename

It's similar to av_get_frame_filename2 but with int64_t number
support. Make av_get_frame_filename* a wrapper over
ff_get_frame_filename.

Co-authored-by: Filip Mašić <shoutplenty@gmail.com>
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
(cherry picked from commit a2d9663241908d6f558b8e6b24bd42f2aaebc144)

Gbp-Pq: Name 0002-avformat-internal-Add-ff_get_frame_filename.patch

17 months agoavformat/mov: don't return the latest stream when an item stream is expected
James Almer [Mon, 30 Sep 2024 13:59:02 +0000 (10:59 -0300)]
avformat/mov: don't return the latest stream when an item stream is expected

Otherwise, things like ICC profiles as read from the colr box meant for an item
with no stream (like a grid) may end up being added to the wrong stream.

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 04182b55494b44152146e6a6bcd5eb9403f00625)

Gbp-Pq: Name 0001-avformat-mov-don-t-return-the-latest-stream-when-an-.patch

17 months agoffmpeg (7:7.1-3) unstable; urgency=medium
Sebastian Ramacher [Sun, 27 Oct 2024 17:31:51 +0000 (18:31 +0100)]
ffmpeg (7:7.1-3) unstable; urgency=medium

  [ Diederik de Haas ]
  * d/copyright: Update for removed and moved files

  [ Sebastian Ramacher ]
  * debian/rules: Disable asm on riscv64
    See https://trac.ffmpeg.org/ticket/11258 for details

[dgit import unpatched ffmpeg 7:7.1-3]

17 months agoImport ffmpeg_7.1-3.debian.tar.xz
Sebastian Ramacher [Sun, 27 Oct 2024 17:31:51 +0000 (18:31 +0100)]
Import ffmpeg_7.1-3.debian.tar.xz

[dgit import tarball ffmpeg 7:7.1-3 ffmpeg_7.1-3.debian.tar.xz]

17 months agoImport ffmpeg_7.1.orig.tar.xz
Sebastian Ramacher [Sat, 19 Oct 2024 15:18:27 +0000 (17:18 +0200)]
Import ffmpeg_7.1.orig.tar.xz

[dgit import orig ffmpeg_7.1.orig.tar.xz]